[automerger skipped] Merge changes from topic "freeze-t-kernel-configs" am:...

[automerger skipped] Merge changes from topic "freeze-t-kernel-configs" am: 6d8dcd4a am: c7be910b -s ours am: b05ca284 -s ours

am skip reason: Merged-In I2c6b1a1d5ec81acfb60380efeca0e6ee24b33089 with SHA-1 e8981922 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2078373



Change-Id: Ief8ed74b1e83f4771a9c0796ef15bf0e1ca049d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>