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: c315e25e am: 5b1ac9a4" into rvc-qpr-dev-plus-aosp am: 71a03b35

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

Change-Id: I07759ef87a7503f6a79f3167ebe53f99d1ba50c7