[automerger skipped] Merge "allow vendor_init to acces watermark_scale_factor" into udc-d1-dev am: cccb610bb4
-s ours
am skip reason: Merged-In Ib5fc92b4f21ca9b1ff6fdd3a32c97117cc12aac0 with SHA-1 2c2e198e61
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/22624776
Change-Id: I1ece813be75b6e1efbd8232e337dd8ed83664f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
e285b839db