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

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



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