Merge "Optimization when looking up requests for release" am: 0cb136a9c5 am: 86059bafb6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc3d2f8cd3716cd7302fde4192fb345c1d8ce00f