Merge changes from topic "IsTagIntentAllowed_24" into main am: 2be55aa2ec

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3343569

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