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