More minor cleanups to ScreenshotRequest am: 930b8b78b6

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

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