This reverts commit eaadd11df8.
eaadd11df8
Bug: 310087158 Test: NA Change-Id: I1833c28cd1eade071a8ea6f66dacaa43a16de057
based on panther 0e0ae4dd4045e00dd50826d5c411351d47949d92 No-Typo-Check: based on above commit Bug: 202250383 Change-Id: I7dbcba9fc0644cf8e547c59b14a544701adc484b