[automerger skipped] Merge "Add new publish trigger type" am: 8bf02e51 am:...

[automerger skipped] Merge "Add new publish trigger type" am: 8bf02e51 am: cdb03e5c am: 99dc6717 am: 3ae9cfec -s ours

am skip reason: Merged-In I6d4802ff12e4b3594cc81903cd83b6f9af6b88b0 with SHA-1 5f0851df is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959005

Change-Id: I805099070d6a19989f22c4f98dc6e735132de065