Merge "[Mainline] android.system package APIs migration"