Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f89 am: aa30c6c5

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

Change-Id: I15e64d86e0b880870d6c2b35aaf8899427cda9c3