Merge "DO NOT MERGE: Rename temp file to use a valid image file extension" into rvc-qpr-dev am: fe652ee800

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

Change-Id: Id0ef2828a976b060d401142255a57c9b20deb7ea