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

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

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