Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
am: 59fb9ccac7
am: 7e8d554a59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674 Change-Id: I523cd10e6aa0d26bf6823685139c9521df848fe7
This commit is contained in: