Android mainline 11.0.0 release 3
Snap for 6393130 from 4769db1a0178e185c810cd451a7c83c3d582b88e to mainline-release

Change-Id: I6a582601fe6f2170085b0fcff3d617ae940c8ee8