[automerger] Merge "Tolerate fullscreen activities not being fullscreen" into nougat-mr1-cts-dev am: 39e6f4b1c1 am: cacf6f4e9d am: c5e8f312e6 am: d905bcbef9 am: 96a9043d3d
am: 9a0c6fead6

Change-Id: Ie717a2a189800e64313f8359c88a558c3b512c9c