am 7f05beb1: am 334a36b3: Merge "Change the text color of timer in MediaController"

* commit '7f05beb125a0270fee58a96b533baf97536d8b7e':
  Change the text color of timer in MediaController