Merge "Restore notification sounds in 2 passes from backup" into udc-dev am: 762da669

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



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