Merge "Add a timeout when loading and releasing screenshot shutter sound" into...

Merge "Add a timeout when loading and releasing screenshot shutter sound" into udc-dev am: f7c510fe am: 6b9a7be0

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



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