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

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