Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"

This reverts commit f553ed04 and really
does merge v5.4.60 into the tree.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I164a49d7930e441b52c8a80b2fa5aa2b7ec41ed9