Merge branch android11-platform-release

Change-Id: I1c7ed396bedef265f1cea804921e1dabdd55ea38