Android platform 12.1.0 release 5
Snap for 8589293 from aca2dbbb1dec98057b3d32a536bd09c7bc610b8a to sc-v2-platform-release

Change-Id: I9d5ac31ea053b652ba3609e4f2598237853de737