Merge "Add kernel test modules for Android 12 GKI 5.4" am: dbd8f14727 am: 04a3300100

Original change: https://android-review.googlesource.com/c/platform/development/+/1875233

Change-Id: I1d001e1d186dbc99d16e288baa1d61d844cc7353