Merge branch android11-platform-release Change-Id: I72209c773ec89a557577f36bae685278af04c8c8