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

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

Change-Id: Ifc37c4675a92e084debe8886f4574451bd681533