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

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



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