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

Change-Id: I91cedada5ebd6c77378d918b90440aca50f000a5