Android 12.1.0 release 18
Snap for 7611421 from aa950fe0c8546fb4a99d32c333125738d42c8f98 to sc-d2-release

Change-Id: I7fe3e8f501c6d0ca4d4960bc9cf1cd6a76f50d10