Merge "Change the intent flag to immutable" into tm-qpr-dev am: cfc1569f12 am: 9cb6a08d16

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

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