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

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

Change-Id: I637e447e6957b86ddab94ef35819db7854a5114a