Merge "Update for MapInfo objects in frame data." am: 7c1ac35257 am: b6bb13647c

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1906877

Change-Id: Ifcaa58ec161a35b80ed6f6deafe41d4c8aa8c9a3