Merge "Optimization when looking up requests for release" am: 29392ab0 am: 9576f318 am: 05530c38 am: f7a5da18 am: 86440c9a

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

Change-Id: I3db2040493a1368baf65afb0f756c03fae1bdff6