Merge "Remove ro.url.legal* props from proto" am: c4fdd9ac1d am: 3b47b26fe3
am: ad013e1c68

Change-Id: If1b207e3eb05cf05d0890dd5e5d4fa4edbf5e5e2