Merge "Remove current.txt files" am: a637f2771d am: 188733a56e

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

Change-Id: I5e0c5766d6cbba60d61c64d9bbfd83be5b2f876b