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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I275dd58da64367ebfdde3ee53a32f4067e636af0