Merge "Guard FallbackHome activity behind permission" into tm-qpr-dev am: 7b63700b0b

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

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