Merge "Cancel acquisition client in scheduler" into udc-d1-dev am: aef8ccbf

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



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