Merge "Add new atom to log userspace reboot performance" into stage-aosp-master am: 17f00a5520

Change-Id: I63208ede5e393037aabb449db800a0d9ba950270