[automerger skipped] Merge "Make all up button speak the default description"...

[automerger skipped] Merge "Make all up button speak the default description" into rvc-qpr-dev am: 796e2b15 am: 7c36892c -s ours

am skip reason: Change-Id Ief2b1410553422cd6f06bd30e00ab4c8a59a3595 with SHA-1 dd0b2dc4 is in history

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

Change-Id: I93c8a288a17f38812bf44d7b1624fe067884d8a5