Merge "Merge "Add cancel_when_requester_not_on_top to device_state...

Merge "Merge "Add cancel_when_requester_not_on_top to device_state print-states output" into udc-dev am: bad895ec am: 6bccc8b0" into udc-d1-dev-plus-aosp am: f6131c0d

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



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