Merge "Allow sensors HAL/daemon to read diag timestamp switch" into oc-dr1-dev
am: f93a0d3c94

Change-Id: I232463123a370f464757160f1452ac770d36ac9e