am 7fd12db3: Merge "Only hide sensitive content when Keyguard is showing" into...
am 7fd12db3: Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc0 automerge: 61059fe8
* commit '7fd12db3':
Only hide sensitive content when Keyguard is showing