[automerger skipped] Merge "Add new atom to log userspace reboot performance" am: 2825673781 -s ours am: c3293fe05c -s ours
am skip reason: Change-Id Id3f81ced73ea708f1dcfbcfd66f554e8daed8ccc with SHA-1 6b24739ea3 is in history

Change-Id: I4acdaac1c8d5baf770426964b7a9a89afecb84bb