Merge "Allow nested usage of ScopedDisableMTE." am: 6ed60cc1ab

Change-Id: Ifc9c20b5beb5a700da3474e770bad8cce503e4fd