Merge "Add a flag meant to guard the talkback fix for the KeyguardIndicationTextView" into udc-dev am: 0404e1bc am: 53749571

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



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