Merge "Check for block location change when configuration changes" into...

Merge "Check for block location change when configuration changes" into tm-qpr-dev am: 4f4d7d3a am: 60eb33e4 am: 1a3da878

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



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