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

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

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



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