Merge "Fix build - tests for screenshot helper not updated." into rvc-dev am:...

Merge "Fix build - tests for screenshot helper not updated." into rvc-dev am: 80c031b1 am: 45f94eae

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

Change-Id: I1bb0a1cc2b5f7693f2b045d116103af1b9c86295