Merge "Merge "Fix extra configuration change when unlocking directly" into rvc-dev am: 54e3542b am: a35ab288 am: d1bc73da" into rvc-qpr-dev-plus-aosp am: abceff4f

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

Change-Id: Id49f27b9c86b2de284892fae9acb94eb14fdb331