[automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am:...
[automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec0 am: 04fadaad am: 2ce68d82 am: 4f3e394e -s ours
am skip reason: Change-Id Iccc60233baaeaa732f197d7aaf31acc9d75a247b with SHA-1 27975949 is in history
Change-Id: I3530b7af52f650b399c110484144ad01d43238a1