Merge commit '92eaf4f0e2dc9ed8815e1ae040cb8fb91838bc47' * commit '92eaf4f0e2dc9ed8815e1ae040cb8fb91838bc47': Add keyguard permission to instrumented ImfTest package.
Merge commit '92eaf4f0e2dc9ed8815e1ae040cb8fb91838bc47' * commit '92eaf4f0e2dc9ed8815e1ae040cb8fb91838bc47': Add keyguard permission to instrumented ImfTest package.