This reverts commit aed3b14abc.
Reason for revert: This fix introduced other issues, see b/386304079, b/384731940
Bug: 319365581
Bug: 386304079
Bug: 384731940
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:612b124b758dd99eba40efc6265c9b646fbbcab1)
Merged-In: Ib49975208888fe54dd8bfb8dc3815f8825c8b5e8
Change-Id: Ib49975208888fe54dd8bfb8dc3815f8825c8b5e8