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

Merge "Merge "Update the 'is valid contentIntent' check" into tm-dev am: ee56c24a am: e80ef180" into tm-d1-dev-plus-aosp am: 48ca72af

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



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