Android platform 12.1.0 release 31
Snap for 8589293 from a86ac4cc82c2eb83b8558b246b2db1be695c63f3 to sc-v2-platform-release

Change-Id: Iaf65fd7ef7104c3f3e171b17c694dbf8037d7454