[automerger skipped] Merge changes from topic "freeze-t-kernel-configs" am: 6d8dcd4aba am: c7be910b99 -s ours

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

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

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