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

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

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