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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11323dffc28c43e9463bd9f0cbcc04fad29f7a6a