Merge "Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime."" am: 23f4e6b0a5
am: cefdacef3c

Change-Id: I1d98832897a49f8bf013476b65afe31768ff03d4