[automerger skipped] Merge changes from topic "libpermission" am: 9b3485f2...

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

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

Change-Id: I57d7961a51f92d61c8a85a1c14eafb09ee5b07a2