Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6

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

Change-Id: I04fdc7c76285de7ad43b83846de10a377eb4f151