Merge "Add caremap proto target for release tools" am: 3ac7598c61 am: 334cff9cca am: 151c395b72

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

Change-Id: Iaf2ed2113c2836a242b2e7af87db38d2f5b088a4