Merge "Fix notifications containing null entries in actions" into tm-qpr-dev...

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

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



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