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

Change-Id: Ia086ac7fcaa4faa45c9fce5463b700d735bec1f8