Merge "Reset the screenshot preview intent on clear" into rvc-qpr-dev am: 1b0cd663 am: de470e25

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

Change-Id: Ib2d3c4fc8c5970190191f9bcbf850ab30ce90567