Merge "Fix extra configuration change when unlocking directly" into rvc-dev...

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

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

Change-Id: I41a66b297fee74e5f2c532e042ea6d9a4a76ae07