Merge "Merge cherrypicks of [17034411] into rvc-platform-release. am: 3911d14018" into android11-gsi