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

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



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