Merge "Guard regionSampler registering/deregistering code behind the flag."...

Merge "Guard regionSampler registering/deregistering code behind the flag." into tm-qpr-dev am: b46daaa7 am: 78b98552

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



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