Merge "Regenerate odm or vendor using combined sepolicy if...

Merge "Regenerate odm or vendor using combined sepolicy if --rebuild-sepolicy." am: f3e73d70 am: 621e9615 am: b51ce80e

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

Change-Id: I32c99555cb7316f456c1e82a476504664a74c092