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

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

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