[automerger skipped] Merge "Fix the device on "Media devices" not updated issue" into rvc-qpr-dev am: ca04ccd911
am: 101308bc39
-s ours am: 7a7af7e23d
-s ours
am skip reason: Change-Id I7a0d9f5332153ee80634e191847b84cd7c380b7d with SHA-1 cafeab2813
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12634109
Change-Id: If05f210d0878fb9dd845749659bf1c2775a6d998
This commit is contained in: