Merge "Add new publish trigger type" am: 8bf02e51dc am: cdb03e5cda

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

Change-Id: I88d81e3a35a84ed273fe0451724d01a721f095e1