Merge "Snap for 6948038 from ff11be1191acb918c5e7e4f11efcbed896bff3d4 to rvc-platform-release am: 59db18f444" into android11-gsi