Merge "Merge "Drop prebuilt files to android source tree." into sc-dev am:...

Merge "Merge "Drop prebuilt files to android source tree." into sc-dev am: 3989c510 am: 1eb67865" into sc-v2-dev-plus-aosp am: f306ed32

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

Change-Id: I99010a30614ce098c40bf39efd920cea483ae10b