Merge "Merge "Clean up rollbacks and test apps" into rvc-dev am: babc3025...

Merge "Merge "Clean up rollbacks and test apps" into rvc-dev am: babc3025 am: c9d61439 am: 9f5e2ceb" into rvc-qpr-dev-plus-aosp am: d3343de5

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

Change-Id: Ibc2c7b0f2ff657812990e9439194ffe9fc0daee8