Merge "Snap for 7316203 from 848f04c30de94942fc099d1dcc42b7949be4c9e5 to rvc-platform-release am: 5c90dc9e5c" into android11-gsi