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

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

Change-Id: I4292dc0cdfe6f81c8563ab23288132ddbe1c6be3