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

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

Change-Id: I8f9fa61ab900107f3ff6849fb29927bd7feaa104