am e35c2d2f: am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev

* commit 'e35c2d2fbc3f5f25db006a51a6e2bc9169389b35':
  Lock screen text: consider possible WFC service in APM