Merge "Merge "Fix build - tests for screenshot helper not updated." into...

Merge "Merge "Fix build - tests for screenshot helper not updated." into rvc-dev am: 80c031b1 am: 45f94eae" into rvc-d1-dev-plus-aosp am: 57ca7523 am: f75662b5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11731435

Change-Id: Ia718a63f086cd733a319ff5aaafce21c0b07284b