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

Merge "Clean up rollbacks and test apps" into rvc-dev am: babc3025 am: c9d61439 am: 281b760e am: 713b3e61

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

Change-Id: I1b505c9ca1c92e7fd9e70932f4ea1cc51b0f1cb6