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

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

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