[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: Ib369a4fd912c14beb5a74d223ea02e3e0b498fdf