Merge "fix result code for user controlled disabled package" into udc-dev am:...

Merge "fix result code for user controlled disabled package" into udc-dev am: 6d5bec18 am: 4cc8e7aa am: cb857ca8 am: 96045ce5

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



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