Android mainline 11.0.0 release 4
Snap for 6450912 from a43518894bb64e0928e446297c45343214ec4c0a to mainline-release

Change-Id: I4e574b979fbe7c79ba92e8cbd62ec399f03d4bfc