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

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

Change-Id: I15b15072068a3d9ee6199247720be13c09751ce3