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

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

Change-Id: Ie97191a9bcfa653abac162edf944e48f81e706e5
Signed-off-by: Automerger Merge Worker <[email protected]>