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

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



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