Merge "Removed android_lily from AOSP codebase" into main