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 am: 8af046a5  -s ours
am: af8e2307

Change-Id: I26adc1561e90d9eeca58bb130c2c137e6fea9f40