Merge "Fix a bug where updates of offers won't find existing offers" into sc-dev am: f8300427d4

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

Change-Id: I7200938e84975231117979d2a2d904878d18f2b5