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

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

Change-Id: I8742f49599e7328b0092861c2315022a3e969a9f