[automerger skipped] Merge "Obtain correct screenshot based on device orientation" into rvc-dev am: 538ee89f2b am: ca6b2ab591 am: fc78c692a3 am: 25e911da34 -s ours
am skip reason: skipped by user jackykao Change-Id: I83133c63c608a1c9537a910bf8f1794719e0a76c
This commit is contained in: