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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f2b42c637c7c7cc7f2149ae0835c0360d79a1d