Merge "Fix extra configuration change when unlocking directly" into rvc-dev am: 54e3542b96 am: a35ab2884a am: d1bc73daff

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

Change-Id: I3050dcf8be9c415c2b34476dd4f7fb4c5409fd1b