Android Platform 12.1.0 Release 8 (8968309)
Snap for 7362794 from 87786984ff2779375417a526d18bf7fe8a759ad7 to sc-v2-release

Change-Id: Icae25c18aef0be301161a5912c91bc4cf5a2dc6c