[automerger skipped] Merge "[DO NOT MERGE] Fix intent launch from...

[automerger skipped] Merge "[DO NOT MERGE] Fix intent launch from notification" into tm-dev am: 03c9ba8a am: 7015deae am: efefcd7c -s ours

am skip reason: subject contains skip directive

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



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