Revert "Merge Android 12 am: d715f253e3"

This reverts commit 663ac8d3e2cc4d3fe635e5d83dd0a957e165ef64, reversing
changes made to c86b8ca14eb3885a01b05aea81e2df10b81dcfc1.

Bug: 202452387
Merged-In: I9c711cc73406d313103462b483e6a4ee34710bb7
Change-Id: I47b75ba5686c25db8aa66cafe7e2ea5a8194835f
67 files changed