Merge changes from topic "revert-20248350-flipFlag-VHUZTJRHFU" into tm-qpr-dev...

Merge changes from topic "revert-20248350-flipFlag-VHUZTJRHFU" into tm-qpr-dev am: f8879804 am: 17009848

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



Change-Id: Ifd53879e0a3709fcd324c1ad77bfce54223a2832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>