Merge "Fix notifications containing null entries in actions" into tm-qpr-dev am: d56f705a

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



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