Merge "Convert booleans in NAI to timestamps" am: 24ca302311 am: 9811f3ed13

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2194765

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