Merge "Fix adb shell cmd activity get-config --proto --device fail" am: c0dd0d6648
am: bb5384dbd0

Change-Id: If3950a91cfa8783fc62c322d2d3911124dc93093