[automerger skipped] Merge "Unhide API isPersistent and getProfileId" am: 012ace16da am: 4a0307dedf am: eb2b918152 -s ours
am skip reason: Merged-In I1aaf0903e2b27b3a3c919e5c08c509a60053e74e with SHA-1 d4ae75e66c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028924
Change-Id: Ia98257444afe4970559221d7c48f0779f1722a41
This commit is contained in: