Merge "Update caremap to by py3 compatible" am: 18370833aa

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1855545

Change-Id: I9e1e721ebb31568b2917b306bd07631554172d94