Merge "Create a new key to backup Sim-specific data." am: 51fae20957 am: cc8ff98d9d

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

Change-Id: Id42dd0e5ce333fa313cf73c300d1dcfbc308d4fe