[automerger skipped] Merge "Unhide API isPersistent and getProfileId" am:...

[automerger skipped] Merge "Unhide API isPersistent and getProfileId" am: 012ace16 am: 4a0307de am: eb2b9181 -s ours am: 1479e3cb -s ours

am skip reason: Merged-In I1aaf0903e2b27b3a3c919e5c08c509a60053e74e with SHA-1 d4ae75e6 is already in history

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

Change-Id: Iac7f35de061050fd8b822228cccebc04ef24d715