Merge "Store keys instead of notification entries." into udc-qpr-dev am: ec8feef418 am: 6ec1e03956

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

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