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: 5aec6493 am: 78422728

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



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