Merge "Amend typo and code clean up for V2 signature and...

Merge "Amend typo and code clean up for V2 signature and PackageManagerShellCommand" am: 72b0ad54 am: 1454bed0

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



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