Merge "Update for new kernel 5.11 headers." am: d57652f15b am: c5b658077b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d9393e92832524070723824d7dff50edd1a584d