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: 3bb81770 am: 6fc36910

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

Change-Id: I464dd573bbc074318f797d0e365c84dfa568037b