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