Merge "Fix sepolicy finalization build error" into main am: 9ef1caab am:...

Merge "Fix sepolicy finalization build error" into main am: 9ef1caab am: c2ddd0e9 am: 8b856c1a am: 1333dc05 am: 59a61712

Original change: https://android-review.googlesource.com/c/platform/build/+/2784031



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