Merge "Remove debug code before beta release." into rvc-dev am: c81dddfd am:...

Merge "Remove debug code before beta release." into rvc-dev am: c81dddfd am: c315e25e am: 5b1ac9a4

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

Change-Id: I4e3b4b414349651355cb060fdf80e49d35b68e55