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

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



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