Merge "Snap for 7217438 from 4127965f58a8b80300f4a674468d369f759daca4 to rvc-platform-release am: cc0bb18d34" into android11-gsi