Bug: 36546152 Bug: 36278706 Test: `adb shell screencap ...` and pull and visually verify image. Change-Id: Iab2ddcfc145cb7f55104cd8f1ce0d58286bca282