Revert "ANDROID: Revert "Merge tag 'modules-for-v5.4' of...

Revert "ANDROID: Revert "Merge tag 'modules-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux"

"

This reverts commit 3fde1dfb.

Revert to the upstream version by reinstating the original
modules-for-v5.4 merge.

Bug: 142892219
Bug: 144336692
Change-Id: I3871c67dd3cba0a5b9b2e1a87be8653a14cb9de5
Signed-off-by: Matthias Maennich <maennich@google.com>