Merge "Fix Quiescent Reboot Reason" am: 850866e94a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751962

Change-Id: If0cd58c17c3049597147389257f4dcfe895b1f54