Merge "Merge "Freeze kernel configs for Android T." into tm-dev am: e35b07b089 am: 3f0187a830" into tm-d1-dev-plus-aosp am: f2f4dc3310 am: 91d07c0ee1

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

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