Android Security 12.1.0 Release 2 (12228897)
Snap for 7401515 from acfb7ba075d32c7ea8bf6c64a9d57870ef856ab6 to sc-v2-release

Change-Id: I6a806798c34229095d8af5066e00a3aa149061c6