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

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

Change-Id: I47d3cceaf99e2eb18ec676ff207edace8dbfdc39