Merge "Fix bug checking incorrect AppOp" into sc-qpr1-dev am: 886d034fb2

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

Change-Id: I3d4b63f97b300a55f1e0055bafa908ea76a17d74