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

Merge "Cancel acquisition client in scheduler" into udc-d1-dev am: aef8ccbf am: 24d3e44f am: 2e887ef9

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



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