Merge "Display back button on home settings." into tm-qpr-dev am: 97976bc3

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



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