Merge "Snap for 7192656 from aba6450ace05c7486ef47880533b2c4bfc12fd45 to rvc-platform-release am: 8175dc9494" into android11-gsi