[automerger skipped] Merge "Remove current.txt files" into...

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

am skip reason: Change-Id I13d9373f7174e2ff2bc54122a1fcfae0b7f7293c with SHA-1 b5ec8a9a is in history

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

Change-Id: I5faef847607e0a40b21781ee24e2385277a11531