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

Change-Id: I300782f21968b2fdac7b76dd96545daa29a6b5cb