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

Change-Id: Ia7f4294130ef9a1116161f92231f62a7ab30a7b2