Merge changes from topic "libpermission" am: 9b3485f2cf am: 02c2b36d8c

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

Change-Id: I59db07745e24bcca54c8be9a29e161078ceaa8b4