Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for...

Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
am: fef074ad  -s ours

Change-Id: I9e6702dc1e7f9dd875f39cfa61bccdb9dfe117a1