Merge "Fix extra configuration change when unlocking directly" into rvc-dev am: 54e3542b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055451

Change-Id: I250c286954cce347c02f53ef66347c8b67b25ba1