[automerger skipped] Merge "Scroll Capture Framework" into rvc-dev am:...
[automerger skipped] Merge "Scroll Capture Framework" into rvc-dev am: 03f9a814 am: d32e93a8 -s ours
am skip reason: Change-Id I6c66a623faba274c35b8fa857d3a72030a763aea with SHA-1 a927929d is in history
Change-Id: Id3f9078b80abfc154e8ebe57a2bc73dd71648a86