Merge "Amend typo for AppOpsManager" into main am: dda33d5b76 am: 4b4607c34f

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

Change-Id: If8111f7fb49cb2a692408d4c1b5e8e54f8c90cbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>