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