Android mainline 11.0.0 release 39
Merge cherrypicks of [14250050] into mainline-media-release

Change-Id: Ie9adc905ebedcaf4460ba2a21a897cad07f4e309