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

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

Change-Id: Ifdd1e89930bc2b2abe116a0e4d0f00931c9b1854