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

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

Change-Id: I7a3da6b3405610b7c95fade112374cb39cc2c32b