[automerger skipped] Merge "Drop prebuilt files to android source tree." am: 5bf40c4151 am: 560ae9e731 -s ours am: d4ccef73cd -s ours
am skip reason: Merged-In I462a1f2ff62fd33145089c28b886a662bf8fc590 with SHA-1 969b96a391 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1717641
Change-Id: I4b4a67523f75e73e9b1f04b0c64fdd8c643b5508
This commit is contained in: