Merge "CSD: timestamp should be in seconds" into udc-dev am: 752b8382

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22184116



Change-Id: Ifecb7918a42737b46472c5746054eef8886e3e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>