[automerger skipped] Merge "DO NOT MERGE: Rename temp file to use a valid image file extension" into rvc-qpr-dev am: fe652ee8 am: e6a08c1e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia415fa6a247e4a6dfa1ba6bb4e73e9445172fda7