This reverts commit db9dfd7885. Reason for revert: fixed by aosp/2422419 Bug: 260366497 Bug: 264600011 Change-Id: I5454fb84cde8bb7b24971388e9a09e31100f7993
db9dfd7885