The CL was intended only for P as a temporary solution. This reverts commit f0800fa3bd. Test: switch wallpapers, observe theme Bug: 110758454 Change-Id: If10e4d87b6ddac10063b2671abd99e0baccdf92e
f0800fa3bd