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

Change-Id: I700e0a09995602c79905b2c8cc3678843fadbb35