[automerger skipped] Merge Android 12 am: b6f4ef44de -s ours am: b2e0ea74ff -s ours am: bab7a3b074 -s ours

am skip reason: Merged-In I118a1dfd5c52cfe1dbc3b1099f29b4146aff1803 with SHA-1 bfaeeaf16c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/1847361

Change-Id: I7cb82d753139bced71508d65fa41946e0890f0ed