Merge "Add a flag meant to guard the talkback fix for the KeyguardIndicationTextView" into udc-dev