[automerger skipped] [Cherry-pick] Increase post-reboot sleep am: b96236cf75 am: 2b663bffda am: 097ece566a am: b3ee54d0ac -s ours am: 213e43ca21 -s ours

am skip reason: Merged-In I978e2c37cb65afde3cf4b9d43297c48cb822aedb with SHA-1 8f4fc2b1db is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/2806054

Change-Id: Ic9486a128ccaba98573938e5e817c565952d6ba9
Signed-off-by: Automerger Merge Worker <[email protected]>