Merge "Fix potential exceptions in CallDiagnosticService and missing locks." into sc-dev am: 4fab561f27 am: afd42c9bce am: 8339f27663
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687876 Change-Id: Ia9b24643cef1249051de64d0b32d7a5f7ad5b5df
This commit is contained in: