Merge "Merge "Fix Bluetooth device details crash on screen rotation" into...
Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d505764" into oc-dr1-dev-plus-aosp
am: 6f48e921
Change-Id: Ibae0621c69a11cc60eb820647a605c7cf8b34e95