[automerger skipped] [Cherry-pick] Increase post-reboot sleep am: b96236cf75 -s ours am: f72b041212 -s ours am: d6fecab062 -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: Ib111767255214fd351f4d404e76838e7a8584c57
Signed-off-by: Automerger Merge Worker <[email protected]>