Merge "Fix build - tests for screenshot helper not updated." into rvc-dev am: 80c031b1 am: 12c90e42 am: 922e781f

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

Change-Id: I5b83e1659617de969ce91fb0164d83ebeea50272