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

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

Change-Id: I399b7e078a2e197d96ad8614d2120bc34637f5dc