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