Merge "Merge cherrypicks of [18321297] into sc-v2-platform-release. am: 4e5009b0dc" into android12L-gsi