Merge "Rectify Boottime property" am: 7397fa566f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2028232

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