Merge changes from topic "flip_flag_v2" into tm-qpr-dev am: 9eff0afd am: 186e4943

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



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