Merge "health 2.1 VTS: fix test on batteryFullCapacityUah" am: 8ae16915ac am: 6fa5d364ac

Change-Id: I983906b298c2fb6c346ff0e3ad248d84cd37842a