Merge "Don't tell anyone how I debug :(" into tm-dev am: 018eec54 am: 39f49d4e

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



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