[automerger skipped] Merge "Add notification ID for APM enhancement" am:...

[automerger skipped] Merge "Add notification ID for APM enhancement" am: d84cfad7 am: 9c435872 am: 42768881 am: 8031738e -s ours am: 85565e76 -s ours

am skip reason: Merged-In I90708ae9b38a40f48fd9003e16c4c45ec71bf53f with SHA-1 b839e240 is already in history

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



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