Merge "Snap for 7316203 from 6161f21e50f730f46d2715af88f3a3cf159bce6e to rvc-platform-release am: 7ce2ad78a2" into android11-gsi