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

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

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

Change-Id: Icbdc40b729edb25217b3a728460a5029e68d3766