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: If8d2790878aac5c829e88aa76098557b2b1f9e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>