Merge "base: add ScopedLockAssertion." am: 3777d9cc10
am: 379b6f403f

Change-Id: I47d1ab2dc1d904e7f22c541232b15ee1ec97aa17