[automerger skipped] Merge "Create a new key to backup Sim-specific data." am: 51fae20957 am: cc8ff98d9d am: e28d4fcc5e -s ours am: 4988aaf257 -s ours

am skip reason: Merged-In I84b42690f8dd3de0cbd795cc13dd5f9ab5a7a725 with SHA-1 1b8956bb03 is already in history

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

Change-Id: Ie5dd684bf1050651f07a7a9c636347e423be700a