Merge branch android11-platform-release

Change-Id: I36b9179a81296d70f531d1857ab0a056c98d3520