Merge "Merge "Merge "Revert "Tolerate fullscreen activities not being fullscreen"" into nougat-mr1-cts-dev am: 96e0b693b2" into oreo-cts-dev am: 7d3035f208" into oreo-mr1-cts-dev
am: cb2c3c6a80

Change-Id: I321bd84c07d9b94e0909326a97ef3bc6e6b8b27e