Merge "Snap for 6948038 from 7082b5a59b456b24469b03b0efca263451c2e642 to rvc-platform-release am: d15cacd764" into android11-gsi