[automerger skipped] Merge "Add new atom to log userspace reboot performance" into stage-aosp-master am: 17f00a5520 am: af7e8210ed -s ours
am skip reason: Change-Id Id3f81ced73ea708f1dcfbcfd66f554e8daed8ccc with SHA-1 41dd57ee22 is in history

Change-Id: Ic2f825661b2f20dd0a29e00c3f67874d7bc1696e