Merge "Merge "Tolerate fullscreen activities not being fullscreen" into oreo-cts-dev am: 1f6c5ed31f  -s ours" into oreo-mr1-cts-dev
am: c7af2fd25b  -s ours

Change-Id: Iccccff568c172d0a7bcb19214611d836aa5ffb68