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

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

Change-Id: I30da7308858dbc5a11bb452b4d0b45e7963737b9