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

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

Change-Id: Ie7dcd01da0f92abaad935763efce61d593184d1d