This reverts commit 431d9d63e993c6056e95811e9a84869aa324e7a0. Reason for revert: Rolling forward with a fix. Change-Id: I5804e240535b84e0f4b2d306649b1981a9871632 Merged-In: I5804e240535b84e0f4b2d306649b1981a9871632 Bug: 74118164 Test: atest cts/hostsidetests/theme