Merge "Include NotificationMemoryModule in NotificationsModule" into udc-qpr-dev am: 747182caf9

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

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