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

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

Change-Id: I9fa0eff0eb9a9bc537a9ad128cd1ddfefc9fec16