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

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



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