[automerger skipped] Merge "Fix the device on "Media devices" not updated...

[automerger skipped] Merge "Fix the device on "Media devices" not updated issue" into rvc-qpr-dev am: ca04ccd9 am: 101308bc -s ours

am skip reason: Change-Id I7a0d9f5332153ee80634e191847b84cd7c380b7d with SHA-1 cafeab28 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12634109

Change-Id: If7f3f14ab9cdcfd74a310dcb7d1776621f4dd2d8