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

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

Change-Id: I40161076e4d26ef91dde8ddf308ca61094150de9