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

Change-Id: I70d80655f53bc50d083ff6a165a472ca7b438f76