Merge changes from topic "rollback" into rvc-dev am: 724bc712 am: 689ae63d

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

Change-Id: I35c66975b215b8a01c1ece676a5385f52ece1e3d