Merge "Allow optional package names in carrier configs" am: 68612ac5 am: c47df2e2 am: 7c7bb0cb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65c281e0e6064b7335b9ca7942de1480d0e998c5