Merge "Fix RegionSampler crashes" into tm-qpr-dev am: 63afdb25 am:...

Merge "Fix RegionSampler crashes" into tm-qpr-dev am: 63afdb25 am: ca3c7f2d am: 82cacb96 am: 47a8bf19

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



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