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 am: 5ab54061

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



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