[automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am:...
[automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec0 am: fde78e78 -s ours
am skip reason: Change-Id Iccc60233baaeaa732f197d7aaf31acc9d75a247b with SHA-1 bb1d2a93 is in history
Change-Id: Iff9af2e5ec0abcb54999339ee77f3ab9684d8c34