Merge "Fix RegionSamplingHelper race condition" into tm-qpr-dev am: 6a2f4e2ab5

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

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