resolve merge conflicts of 74f9c2a0 to master

Merge conflict resolution for merge from AOSP CL:
https://android-review.googlesource.com/c/platform/frameworks/base/+/1496302

Root cause of merge conflict is delta between AOSP and internal in how the
aosp current.txt files are stored.

Bug: 163085177
Change-Id: Ia30f9f3203f2d5220186e194a81bbe321fe6e0d6