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

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

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