Android mainline 11.0.0 release 7
Snap for 6916203 from e25a77643e3865f72e17b28f7ce2fdedbcdadec5 to mainline-release

Change-Id: I4373507637ddf5a7324e50416e803855d22346d6