Merge "Update a11y content descriptions" into sc-dev am: a3d48ea4b3

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

Change-Id: I411dd34e106878db5add296010274accfaa49f05