Merge "Move carrier package to shade" into udc-dev am: 4c6f5787

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



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