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

Merge "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: 889d326e" into oc-dr1-dev-plus-aosp
am: 3b7277ef

Change-Id: I082d86f8e65b339f4dd9d7b62b32a8622b86a72f