Merge "Avoid linear scans of database tables" into main am: ee03b3502f am: 7d37446f5e

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

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