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

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

Change-Id: Ibbaec6b7a0bc26f0913650407d5700026597cea3