Merge "Add new atom to log userspace reboot performance" into stage-aosp-master