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

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



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