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: 12c90e42 am: 922e781f am: b0102fb6

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

Change-Id: Ibc68c6ac42f36b24961a446e1da83e1a71f06dd6