Merge "Add test size to TakeScreenshotServiceTest" into tm-qpr-dev am: 03ef589f am: 3f9605ba

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



Change-Id: Ib53a2938a0aa4ca53d55c072f9698a57571371b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>