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 am: eb3ac1cc

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

Change-Id: I84ea65012bb817b31ed22eac53da2c5187572686