[automerger skipped] Merge "Fix shell command bugs for supporting CTS test. Add service unit test. Fix javadoc." into tm-qpr-dev am: b2f2546b5b am: a98765cb86 -s ours

am skip reason: Merged-In I0fd2950eea267d56fbd8e89ecc52fdd590992e75 with SHA-1 44eafb8f58 is already in history

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

Change-Id: Ifc56a0972bccb05a96d25428e2852aeca4f83524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>