Merge "Fix operation auth bound keys." am: b3671c4ab5

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

Change-Id: I25a5f2d933e3bdb97057b2dd470213538f5f5c06