Merge changes from topic "libpermission" am: 9b3485f2cf

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

Change-Id: Icb89ad58ec2d5ed486d1a145bab21109aad05922