am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev

* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.