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
am: 9fa68b6b

Change-Id: Ifabc90ad9a4b4b4b6bea64ba1f57bfa5ca1197ca