Prevent bonded device from being removed from the property map
am: c4b1ccb468

Change-Id: I9d41d8834a5524c98bcb1e1d1ff2e67deb0a9501