Merge "Generate care_map.txt when AVB is enabled"
am: 65b98cd3b1

Change-Id: I9fd14966a7264d560c940bacebe8ef5b8a4722da