Android mainline 11.0.0 release 4
Snap for 6545159 from be7dffa7316362bd093dfc85ddc5a63dd79b5dd5 to mainline-release

Change-Id: I21848629e5839c495eecb886cb93c3892d64735b