Merge "Fixed a11y announcement while setting a PIN" into udc-qpr-dev am: 620ac5ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24774257



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