Android Mainline 11.0.0 Release 6 (7124067)
Snap for 6981242 from 49db501563baddadaf1ed93c86abd65f242d5411 to mainline-release

Change-Id: I1614e35b2bc68912a710ad9bd8e8ed3a7a8ebdac