There is a dependent change in frameworks/av Change-Id: Ic189654486936a501a1b45c5acb442753303d362 related-to-bug: 5883234