Bug: 220029740 Test: Run adb shell command Change-Id: I0c444a56c76530304a24b5170500c87fe0e12713 (cherry picked from commit 393b31f0)