Merge "Fix odm privapp permissions" into main am: ce4a43498f am: cf6ed87de2

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

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