Merge "Add notification ID for APM enhancement" am: d84cfad742 am: 9c43587237 am: 4276888169

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

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