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

Change-Id: I01ce605a0aa375392fb84c8c34183b07030a3c62