[automerger] Merge "Android N change source file on 420dpi android.theme.cts.ThemeHostTest#testThemes" into nougat-cts-dev am: 110d422250  -s ours am: f5dae9a8f9 am: 950f458f74 am: 0114928b64 am: aae21eb48b am: 49041c9388

Change-Id: I43d695c6d140e60fb7394b92a4a82344205643e6