[automerger skipped] [DO NOT MERGE] Fix intent launch from notification am:...

[automerger skipped] [DO NOT MERGE] Fix intent launch from notification am: ace85513 am: c0ce3baa am: 115fc470 -s ours

am skip reason: subject contains skip directive

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



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