Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496" into oc-dr1-dev-plus-aosp