Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev am: 8b0ef791

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



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