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

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



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