Android platform 12.1.0 release 31
Snap for 7691524 from 863f4b33ac0a905e4e25e53c8a279cad78357f58 to sc-v2-release

Change-Id: I242893eb8b08d7f704d2ec5e743a778f13fbf549