Merge "Always save long screenshot temp file to the same place" into sc-dev am: 4bb1104c87

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

Change-Id: Iac728bc6e6570e0732d6889d7b4745f2f83480c8