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

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



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