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

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

Change-Id: Ia4b3c4bf5e1935a8dbfb925c1a1e365ba79af3a6