Merge "Allow optional package names in carrier configs" am: 68612ac556 am: c47df2e2e9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia937988ef040a85a028ec45d69fad3f291860904