[automerger skipped] Merge "Rename back button to navigate up button" into...

[automerger skipped] Merge "Rename back button to navigate up button" into tm-dev am: 8c3eb0d6 am: 1593958b -s ours

am skip reason: Merged-In I23bc580b193cc891b659514d13705db2c55b756a with SHA-1 00cbd72c is already in history

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

Change-Id: I31744754ca1a18c6fda38293a48b793909033461