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

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

Change-Id: I0b801ad4cde311410848ecd0d090115b81679ee9