Merge "Limit number of notification actions created" into tm-dev am:...

Merge "Limit number of notification actions created" into tm-dev am: 7a06b6ae am: 8a5c4f6d am: 7bb60dfe

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



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