Merge "Merge "Stop overwriting files" into rvc-dev am: 5ebbb014 am:...

Merge "Merge "Stop overwriting files" into rvc-dev am: 5ebbb014 am: 36d01b40 am: fff2f2c2" into rvc-qpr-dev-plus-aosp am: 0852e79a

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

Change-Id: Ie5407d0789e6e52a110a323fc3c68443048082c0