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: 5eec25a6 am: cdae4094 am: 0ad0a8d2

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

Change-Id: I5bec102566b869f06670695274bd0e97d8a92219