Merge "Supress a test on kitkat." into nyc-support-25.1-dev
am: 9df3e2e00d

Change-Id: I6281c7386fa773f4965681607fbbcf6ac998cbd7