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: b0ea0a76 am: 01e8dde6

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



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