Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev
am: 898b0cb39a

Change-Id: Ifdc2b56ce9b59ea9c3f185fb6fac8850842bbb67