Merge "Block intents with action set as null" into udc-dev am: 3d7c3b68 am: 401132ea

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



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