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 am: 6bccc8b0

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



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