tree 52f4cc8588931e1590e9b60f2f04e30035b9db37
parent bfaeeaf16ce002bfb3a29d43efdd28181045c5f1
parent bab7a3b07454f34600b0d76da6e404b7fd380ac1
author Xin Li <delphij@google.com> 1633660547 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633660547 +0000

[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