Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev
am: e4999751ab

Change-Id: I812a58e2a0fead5b9a1eec9e9cf1b2383de1321d