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

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

Change-Id: Id33a233789eb58e6ef5be2d5edf3f504c9b4eb12