Merge "Take new screen shot before kill previous one." into rvc-dev am:...

Merge "Take new screen shot before kill previous one." into rvc-dev am: c93f22f2 am: c802d990 am: 26c5e0b3 am: 95340866

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

Change-Id: I17cff3650983f612c508ec5ebe5a8c97b214b56b