Merge "[automerger skipped] Merge "Remove current.txt files" into rvc-qpr-dev-plus-aosp am: 28e22347 -s ours"