[automerger skipped] Merge "Limit ordering unlock and wake by configuration." into udc-dev am: 56ccfa70f2 am: 754881731a -s ours am: a289b013b6 -s ours

am skip reason: Merged-In I2bdf8bb16dba693c4afb824e861ab4b87783d61b with SHA-1 45c5e0412c is already in history

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

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