Merge "Use system api for shell command handling" am: 9c0d523b am:...

Merge "Use system api for shell command handling" am: 9c0d523b am: 67daa7f6 am: 2b776052 am: 8e75cf95

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

Change-Id: Ib1983313f09336f1bac13a8a84e80cffeee721f7