Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
am: 4d3264553c
am: b40c753898
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916 Change-Id: Ie66861304e65fec17aa48c59c11052c0cafc069a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: