[automerger skipped] Merge "Add Emergency callback mode shell command" into...

[automerger skipped] Merge "Add Emergency callback mode shell command" into rvc-qpr-dev-plus-aosp am: ee605797 -s ours am: af645c31 -s ours

am skip reason: Change-Id If6ca01283a02a4c1f762eaa0f4cd798d48781761 with SHA-1 b201f9b1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfdf3161354fb47067e29c04115c1d4ab3d42721