tree db2c9fd3734ccbfb594c2925a9b946d77a9e3abd
parent a9914ea6df503f7e23ca26281e8ee5f2e7b3acf6
parent 54e3542b966361df006655ebdd234d4b9d2649e5
author Riddle Hsu <riddlehsu@google.com> 1594071639 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594071639 +0000

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

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

Change-Id: Iff4d865222a9b03b137062dca0da476d93660d01