[automerger skipped] Merge "Add simulate-device-(dis)appeared CDM shell...

[automerger skipped] Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev am: 8b0ef791 am: 86dbbc48 -s ours

am skip reason: Merged-In I5dad0b1859f5292fc0db68ca6ce2114eaa889d4e with SHA-1 0197bcfd is already in history

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



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