Merge "Rename back button to navigate up button" into tm-dev am: 8c3eb0d616

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

Change-Id: I8ff8475b95262fb176af4a86cab8f8876f52c282