[automerger skipped] Merge changes from topic "libpermission" am: 9b3485f2 am: 02c2b36d am: bf8ed6e1 -s ours

am skip reason: skipped by user smoreland

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1674209

Change-Id: I729b016433bb6313fa1f604588bae8ffbb0b2017