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

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



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