Merge "Fix setRequestedOrientation() freeze on Android Wear." into oc-dev
am: a30fdcb687

Change-Id: I0046647f4f773acb06a1dcdb45d0499ee831ae2a