Merge "Add a conditional boolean to ScopedAssertNoThreadSuspension."
am: 5129d8ede5

Change-Id: I13ce888aa276ae6304874d8985dc08cff7424b95