Merge "Fix broken android.theme.cts.ThemeHostTest" into oc-dev am: ad9ac486e0
am: c91b34de2d

Change-Id: If70695877d5e983018e0149dc90a716741135285