Merge "[automerger skipped] Merge "Reset the profile when system application change version." am: 1771240c80 am: 16523acfa2  -s ours" into pi-dev-plus-aosp