Merge "Resolve setContentIntent to single code path" am: 2fbb619b am:...

Merge "Resolve setContentIntent to single code path" am: 2fbb619b am: 6afd211e am: 5d4b952b am: 73d68061 am: 8bc0fcdd

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



Change-Id: If2c2cdbbc9d8f3b0a28a3cc969af64d903d98fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>