[automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 am: 04fadaadeb am: c43c81018e -s ours
am skip reason: Change-Id Iccc60233baaeaa732f197d7aaf31acc9d75a247b with SHA-1 bb1d2a931b is in history
Change-Id: Ia293f8d8a2df7068bd5f95464d323e3a0d6afa49
This commit is contained in: