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

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

Change-Id: I916c15a1be783916df2ea61f19c4644cbceb7f17