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

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

Change-Id: I7ed4ba64cf5edb3e51146e983976d687b2e79df1