Android mainline 11.0.0 release 3
Snap for 6916203 from 8cd9950a30d7123f94f31f64c35a1610843b052a to mainline-release

Change-Id: If4fdd61e7da84fd0f3c383ace2433bb2e42c43d0