Merge "Update preinstalled-packages-platform-overlays.xml"