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