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

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

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