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

* commit '20bd0c232cd4421affc871ccd01492ecd04316d0':
  Ensure notifications are sent when locking/unlocking location share