Merge "ActivityManager: Make bootcomplete marker failure a warning" into nyc-dev