[automerger skipped] Merge "Limit ordering unlock and wake by configuration."...

[automerger skipped] Merge "Limit ordering unlock and wake by configuration." into udc-qpr-dev am: 0f8dab21 am: 454d4ffa -s ours

am skip reason: Merged-In I2bdf8bb16dba693c4afb824e861ab4b87783d61b with SHA-1 3d9eb009 is already in history

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



Change-Id: I75f120c7d0d9652ea777ae37cd9dfaa31febd96c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>