am fe90e4b1: am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1

* commit 'fe90e4b1cf27f41b939590d775406d7021fc8014':
  Rename the activity lifecycle sample's directory