Merge "bootstat: refine sys.boot.reason if device boot up from shipmode" into...

Merge "bootstat: refine sys.boot.reason if device boot up from shipmode" into main am: f2bb4d17 am: 1935a13a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3458559



Change-Id: Icb24f86c47c36d5eb14ec03dbd2fceb8adf1ac21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>