Merge "healthd: Fix charger_res_images_vendor install location" am: 641037cc...

Merge "healthd: Fix charger_res_images_vendor install location" am: 641037cc am: 25c4cdb4 am: 7f4d939d am: bbc9a3ce am: 05937831

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2197736



Change-Id: Ifdcf82b91a5a6765a8886e9f9f88124c8fe7a3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>