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

Change-Id: Ie918fe8c074a2d71b0f55fb47a62f74fcf8ece64