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 am: 66b5a0aa -s ours
am skip reason: Change-Id Iccc60233baaeaa732f197d7aaf31acc9d75a247b with SHA-1 bb1d2a93 is in history

Change-Id: I55bcd48280299037a2c8db26e492515c34874620