Merge "Modify handling of notifs with invalid sounds" into tm-dev am: 08f60390 am: c6890ca2

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



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