Merge "Add Global Settings to device whether show Carrier menu" into pi-dev am: ff03f0cfe4
am: 166f56c4cf

Change-Id: I737af4163b98dc16cae7f9618310d1e2398a6526