Merge "[automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev...
Merge "[automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec0 am: 04fadaad am: c43c8101 -s ours am skip reason: Change-Id Iccc60233baaeaa732f197d7aaf31acc9d75a247b with SHA-1 bb1d2a93 is in history" into rvc-qpr-dev-plus-aosp