This reverts commit 3fde1dfb006cd16bed3153fb035ca62ac9604df0. 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>