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: 7c45fd26 am: 73480479" into rvc-qpr-dev-plus-aosp am: c9ae75e2

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

Change-Id: I8206c0f4eb1acfb136feec667a3e6681b875f7cc