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

Change-Id: Ic21b3091d47cd65cfa36b26cfeb00042255b91ec