Merge "Limit ordering unlock and wake by configuration." into udc-dev am: 56ccfa70 am: 9c5f9b9c

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



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