Merge "Drop unused PerBootDbKeepAlive type" into main am: 98e175b6f8 am: a5ee446635

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3037727

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