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

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

Change-Id: I7115e660454b0cc502e5a8b75b15f01748a633d7