Merge "Use system api for shell command handling" am: 9c0d523bc0 am: 67daa7f61b am: 2b776052af

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: I8bc3e27c6cb9f7be7056d1124458c4e283a0f945