Merge "wifi: update method name for timestamp related APIs" into oc-dev
am: 15f09b5d64

Change-Id: Ib6b3d5d5cc438e342b106f2482bd838af4477b48