Merge "Clarify that up to 5 custom actions will be honored" into udc-dev am:...

Merge "Clarify that up to 5 custom actions will be honored" into udc-dev am: d063870c am: 08c09745

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



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