am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev

* commit '059b8ab6a9444b1dbdfcdc1df50485dfac7adafa':
  Ensure notifications are sent when locking/unlocking location share