Merge "Merge "Merge "DO NOT MERGE: CTS: Wallpaper is not shown in VR" into oreo-cts-dev am: 7cd40401e1  -s ours" into oreo-mr1-cts-dev am: 2f746c5340  -s ours" am: 8512454c5d  -s ours
am: 2061c77fcb  -s ours

Change-Id: Idb7b2d729c2c7ec14e1c5fe53d361cebb09ba2ea