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

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

Change-Id: I584e0afe94985d9decf915131796a8a53be67cc3