Android mainline 11.0.0 release 3
Snap for 6626737 from d036dbfbc0d7f610b3ee4604829578d9a7027a21 to mainline-release

Change-Id: Id5585dafef2f282e3cfb3b14d22b562d52df094e