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

Change-Id: I6535c07aaf3a62db028da439ead2172c756ef63f