Merge "Snap for 6948038 from ffb037b656d5d6b09132d31f4a928b90e0c180b1 to rvc-platform-release am: 404c9d81e6" into android11-gsi