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

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

Change-Id: Icbd71b6271b84ea8c0950d6abe5ec26b23d01bdd