am 819ca65f: am 5b42ec36: (-s ours) Merge "DO NOT MERGE: A better shadow value to cover more devices, handle TV theme override." into lollipop-mr1-cts-dev

* commit '819ca65f96d83b01b22a7d8f4a4037aa6059aaa6':
  DO NOT MERGE: A better shadow value to cover more devices, handle TV theme override.