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
am: fe26fadf

Change-Id: I5ee1baf2285f4efb000f8077377313d367325264