Merge "Correcting Offset and size checks while queing" into main am: 3376c751 am: 81227054

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



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