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

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



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