Merge "Make setTimeLapseConfig take frequencies instead of periods." into oc-dev
am: 2200bb2e96

Change-Id: I5489dc6b3b3bc1acface3f6620b2d330bacf8309