Merge "fix result code for user controlled disabled package" into udc-dev am: 6d5bec18 am: 5aec6493 am: 78422728 am: 7283fa0e

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



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