Merge "Merge "Always save long screenshot temp file to the same place" into...

Merge "Merge "Always save long screenshot temp file to the same place" into sc-dev am: 4bb1104c am: 4b54abdb" into sc-v2-dev-plus-aosp am: 79060d4d

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

Change-Id: I76c458914e2c8355af35a1c1c35f4da67217f78a