am bea94e06: am 1d3e3ca1: Merge "TIF: Use per-user ContentResolver in the TvInputManagerService" into mnc-dev

* commit 'bea94e06d1e4f9a87963c280fe9cfafec28779c7':
  TIF: Use per-user ContentResolver in the TvInputManagerService