Merge branch android11-platform-release

Change-Id: I0ea841a5f5a4875e90bee99a3b62a5abf3139c18