Merge "Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
am: bc0cf0d87f
am: 48efcc5547" into sc-v2-dev-plus-aosp am: 6f1fa17967
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674 Change-Id: I131e90d3b9bee09242a0c9ce5787ebd82e8d46ea
This commit is contained in: