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

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

Change-Id: I5210598ea5607d1e1fe6b146b432b994a3f6c3a1