Merge "Fix home settings intent resolution." into sc-dev am: 8772a0ef35 am: 74bfb35ad8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/14792802

Change-Id: Id00c67da2dd000d5c5959dc5f19836284ec80d3f