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

Change-Id: I6f0e5e11fc36f24f72a5693f2d85388c51e82e63