Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec
am: 07089739be
am: 3aaf35cac1
am: a01f125313
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602 Change-Id: I9398541e8a0afabbb470382fe5f1348ecbbb30f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: