Merge "Snap for 7192656 from ba349a1f1bfd220317a0a69a592abc712f1e40d0 to rvc-platform-release am: 8c96015206" into android11-gsi