am 76a19722: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-mr1-ub-dev

* commit '76a19722646bbfe29bcab2a1062848799b35c9c8':