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

Merge "Merge "Remove debug code before beta release." into rvc-dev am: c81dddfd am: 7fd4b133" into rvc-d1-dev-plus-aosp am: 6566795c am: 1e9f6ebb

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

Change-Id: If4f8520b7cf706f7f763a647b0879c4acfd0b584