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

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



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