Merge "Add user handle in SimInfo database." am: 15bc01b949

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

Change-Id: Id7d969863c7814f0b981866caeb7b42a2f160f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>