Add new APIs for watermarking

Bug: 263762255
Test: m
Change-Id: I7eeaa58f0a3a1056f33e22aba42540636794ade1
18 files changed