[automerger skipped] Merge "Update for libunwindstack shared_ptr MapInfos."...

[automerger skipped] Merge "Update for libunwindstack shared_ptr MapInfos." am: e88e9922 am: fc6d2b4c am: 56cefec1 am: 86c65c57 am: 0a8dcacf -s ours

am skip reason: Merged-In Ieae157388e8571345ed8968a2b5c2aa34464689f with SHA-1 853733b6 is already in history

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

Change-Id: Ic4a54ee7a01c8cee457397640600479150a28529