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

Change-Id: I87de4148215f168aa2d4da566bbbc3fb40699f41