Merge "Allow ACQUIRE_CAUSES_WAKEUP for apps targeting pre-U sdks" into udc-dev am: 18f2b65a

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



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