Merge "Merge "Minor cleanups and fixes for ActionIntentCreator" into...

Merge "Merge "Minor cleanups and fixes for ActionIntentCreator" into udc-qpr-dev am: 62e6b210" into udc-qpr-dev-plus-aosp am: 0623e241

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



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