Merge "Convert frameworks-base-overlays to Android.bp" into main