[automerger skipped] Get screenshot to exclude black cutout am: f4e02874b2
am: a1e8046c9f  -s ours

Change-Id: I5ffde899c973ed3033a3ecc24cbb9cc9191f2015