Merge "Clarify Health 2.1 design capacity type ranges" am: 80c84717d8 am: 75c766946f am: 55f5d51881 am: d613f40cf3 am: dfc474c1e2

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

Change-Id: I0c7e8bb00aa6cf676510b3c5060407913e369e43