Merge "Lock screen orientation of CapturedActivity" into nougat-mr1-cts-dev
am: f7d1255782

Change-Id: I339b697e3a13dacc9a8f036308067ea21a409b3f