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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4cf04ca73239f84644edb654b6dc937505570ea