[automerger skipped] Merge "Remove current.txt files" am: a637f277 am:...

[automerger skipped] Merge "Remove current.txt files" am: a637f277 am: 188733a5 am: 349f9002 -s ours am: 8977d2d4 -s ours

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

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

Change-Id: Iaeac19d39276c60b804258e24154887d9a5fe8d2