Merge branch android11-platform-release

Change-Id: I1b84be29d924ed8304d52b3664b5b452299840ca