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: 7fd4b133 am: 5ab03030 am: f81b43b8

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

Change-Id: I1ae4dcca05a5897c567bc4ad09b5c2f094ec6534