Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a  -s ours am: 9905f0b7e9
am: 743aedb8a7

* commit '743aedb8a76bebec4867af33d9f5e4ba7892f234':
  Fix CTS 4.4 R4 testHoloTheme test failure.