Merge commit '8f4fbc5c9f52157439af6a73ee556cc80d041f5f' into eclair-mr2-plus-aosp * commit '8f4fbc5c9f52157439af6a73ee556cc80d041f5f': Add keyguard permission to instrumented ImfTest package.
Merge commit '8f4fbc5c9f52157439af6a73ee556cc80d041f5f' into eclair-mr2-plus-aosp * commit '8f4fbc5c9f52157439af6a73ee556cc80d041f5f': Add keyguard permission to instrumented ImfTest package.