Merge "Add SIP configration Bundle keys for UA and CNI" am: 5c389e2507

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie115198f4e69bf4cd270980315bfc9a98e522e87