Merge "Merge cherrypicks of [17605899] into rvc-platform-release. am: cef637a4fb" into android11-gsi