Merge "Fix updateResolvedBoundsPosition offset computation" into tm-qpr-dev am: 43608217f8 am: 5d7c534c53

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

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