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

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



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