Merge "health: Add CAP_BLOCK_SUSPEND" am: ae11855809

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1461183

Change-Id: I06480aeb9a2c26fa5ee33adcdca061be1ea56dc2