Merge "Update current device when volume control id changes" into udc-dev am:...

Merge "Update current device when volume control id changes" into udc-dev am: 2f63277b am: c434411b am: 78efd69c

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



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