Merge "Consume design capacity in health HAL 2.1" am: c7b92ea120

Change-Id: Iedba862c1ca0a001b2262bf07ddc58beef2a5d37