Merge changes from topic "rollback" into rvc-dev am: 724bc71208

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

Change-Id: Ia04046357fdef681f6bacf9077966e500e07d991