Merge "Merge "Allow ACQUIRE_CAUSES_WAKEUP for apps targeting pre-U sdks" into...

Merge "Merge "Allow ACQUIRE_CAUSES_WAKEUP for apps targeting pre-U sdks" into udc-dev am: 18f2b65a am: f33cff61 am: f3334e5b" into udc-qpr-dev-plus-aosp am: b3418057

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



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