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

[automerger skipped] Merge "Limit ordering unlock and wake by configuration." into udc-dev am: 56ccfa70 am: 9c5f9b9c -s ours

am skip reason: Merged-In I2bdf8bb16dba693c4afb824e861ab4b87783d61b with SHA-1 95ac41ac is already in history

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



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