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

Change-Id: I9ab28e88f627abca0ca00901bdfa0b5a0afbfa4f