Merge "Add visibility for new location of permission apex." am: 3525be21 am:...

Merge "Add visibility for new location of permission apex." am: 3525be21 am: e1c8e598 am: ab95b335 am: 652aedd5 am: dd23c4cf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560528

Change-Id: I650c9147c7a50b8a22931bbc0f96b8c1d71f7bb2