Merge "Merge "AudioDeviceInventory: better error handling in clearDevicesRole"...

Merge "Merge "AudioDeviceInventory: better error handling in clearDevicesRole" into udc-dev am: 7c20a56b am: e6e43cd1 am: e72df0cb" into udc-qpr-dev-plus-aosp am: a3ba9443

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



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