Merge "Catch failure to set screenshot sound" into tm-qpr-dev am: 077eafba am: 8a23d05e

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



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