Merge "Clarify Health 2.1 design capacity type ranges" am: 80c84717d8 am: 75c766946f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1437295

Change-Id: I07e8a94bb2319cea56234fe6a35397dd69b40dbb