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: f895e3b9 am: f42f2f27 am: 0e6a5ce7

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



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