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: Ia0c2d7fb694b552414218dbfca09d53187f786e6