Merge "Snap for 7316203 from a1c567b53c0fb9434daa64307edff9ebf16fb253 to rvc-platform-release am: 8b4024be41" into android11-gsi