[automerger skipped] Revert "sync codebase" am: ac2409b49c am: d763b7e277 -s ours am: d8fe9be6e6 -s ours

am skip reason: Merged-In Ic45113b27aa8f90e1ec909068bf2d67589571b23 with SHA-1 f2ed6036c9 is already in history. Merged-In was found from reverted change.

Original change: https://android-review.googlesource.com/c/device/google/bonito-sepolicy/+/1763389

Change-Id: Ibc3938846fbebdbe29bb0981e6e01b23d644c9b8