Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24a...

Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24a am: aecbda38 am: 8f578a9c am: 2ca8e0fc

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



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