Remove CDM entries in Connected Device.

BUG: 191992001

Test: Robotest
Change-Id: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
(cherry picked from commit 11655705dbce7ecc72ab800c107dcc51fd398f83)
2 files changed