[automerger skipped] Merge "Provide an option in KeyguardIndicationTextView to...

[automerger skipped] Merge "Provide an option in KeyguardIndicationTextView to always announce the text being displayed" into udc-dev am: 2bd021f9 am: ca72151b -s ours

am skip reason: Merged-In I8e8328cc133ca126c3eb40c0623e1dfc0eafbb04 with SHA-1 4ffe0d60 is already in history

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



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