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

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

Change-Id: I2f27bb1d7837c65c9f0ac0db99fa387d04e077bb