Merge "Snap for 7097357 from 02fb18082ac7f00d2934a38df25d10a852f68a0f to rvc-platform-release am: 80bf9be090" into android11-gsi