[automerger skipped] Merge "Enable Region Sampling for Lockscreen Smartspace"...

[automerger skipped] Merge "Enable Region Sampling for Lockscreen Smartspace" into tm-qpr-dev am: 84e72e57 am: bbe73591 -s ours

am skip reason: Merged-In Id890309c95eab1251d09485ce560e1eae5c15900 with SHA-1 a57e4ce3 is already in history

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



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