Android mainline 11.0.0 release 4
Snap for 6330721 from 253c39efd7a9d83108e4f727e0130d614df06e95 to mainline-release

Change-Id: If46dc003bc566ad7a664165af38750e83f42c782