Merge "Allow ACQUIRE_CAUSES_WAKEUP for apps targeting pre-U sdks" into udc-dev am: 18f2b65a am: 41ca9353 am: 30f4ce1b am: d5ecd460

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



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