Merge branch android11-platform-release

Change-Id: I6dfa56d0a87123a11c6bec263773f1b6980e428b