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: 417b1143

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



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