Merge "fix result code for user controlled disabled package" into udc-dev am: 6d5bec18 am: 291abcaa

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



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