Merge "area info update improvement" into mainline-prod am: 51571f8993

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

Change-Id: Iccbe9f7fbc9de42102fafcf98d422a98db6cbd6c