Merge "Add shell commands for carrier config debugging" am: 0dfcfa6b32 am: cf3a86715f
am: 9ba143e789

Change-Id: I7dbc6e25b6ec43197fc6a301dd8910bc55be6c78