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

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

Change-Id: Ib801126f74c80b3cdcda821902bf97abeedc6497