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

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



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