Merge "reflect libbinder->libpermission: appops" am: b63a295aad am: 4c6cedf24e

Original change: https://android-review.googlesource.com/c/platform/cts/+/1674265

Change-Id: I673b38673d245c14d813477042c29458ebb71d47