Merge "Add Global Settings to decide whether show Carrier menu" into pi-dev am: 8ce1962b6e
am: a5474e947f

Change-Id: If562131a77b08f922c31ce029529f5a29c499dcb