Merge "Add cancel_when_requester_not_on_top to device_state print-states...

Merge "Add cancel_when_requester_not_on_top to device_state print-states output" into udc-dev am: bad895ec

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



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