am b41f9421: Merge "resolved conflicts for b6c719ec to stage-aosp-master" into stage-aosp-master

* commit 'b41f94219d6a9c93803ea1897b0efba15a50efac':
  Enable signed-integer-overflow in timedtext