Merge "android.theme.cts.ThemeHostTest CTS testcase failure Fix" into pie-cts-dev
am: 91b96264f0

Change-Id: I9ea82c516e3bc44fc4cfd2e9dfcfd67bfa55fe00