Merge "Snap for 7316203 from e87aba0c46b6f319ac52eaaa64a32673de05a567 to rvc-platform-release am: 642d23f25a" into android11-gsi