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: 1cc59a1f am: 8916d044

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

Change-Id: If4b09495e4068a2f6f51d68f163bd78b354f90ae