Merge "Remove teamfood override for NOTIFICATION_MEMORY_LOGGING_ENABLED" into...

Merge "Remove teamfood override for NOTIFICATION_MEMORY_LOGGING_ENABLED" into tm-qpr-dev am: 037530ec am: f09b460a

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



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