[automerger skipped] Merge "Drop prebuilt files to android source tree." am:...

[automerger skipped] Merge "Drop prebuilt files to android source tree." am: a3c01dcf am: 9400e32b -s ours

am skip reason: Merged-In I8e06cb5b5a8407316a83df7b9eb95a651dc677a9 with SHA-1 6f87dc54 is already in history

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

Change-Id: I362954da6eea44a4f129a733687dd5d13e01b04a