Merge "Enforce guards against crash command via shell" into tm-dev am: 4d2ea02b am: c4cc7ff9 am: cd92eea2 am: 4cd24360

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



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