Android platform 12.1.0 release 31
Snap for 7269314 from e8d7d82d7658d699c03c8b3b377320d2ecdc53b6 to sc-v2-release

Change-Id: Ib12acb55114dd6fec552346ee36c04509612ba75