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

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



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