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

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

Change-Id: Iaa6b59f763df451d37773b4cdc25f493b81a78e8