Merge "Adjust to MapInfo to new api." am: 8255631fa9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1509951

Change-Id: I5390e1a6f86a8d4c517f15742ed758dbb12873c4