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

Change-Id: Iadec84d8659bc5778327108a5554e0514f6a8643