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

Change-Id: I45135f3159b758b6dc265bfdd3cf070bf5199031