Android Platform 12.1.0 Release 8 (8968309)
Merge cherrypicks of [19419128, 19459610] into sc-v2-platform-release.

Change-Id: I4933861aee227d2083a6c28963b8f5a8231146cd