Merge "Remove current.txt files" am: a637f2771d

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

Change-Id: Ief0dbfab6808f3bb59cc6b74933a8ac1d802e11d