Merge "Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev am: 6b87569b4c am: 780da3b704" into nyc-mr1-dev-plus-aosp
am: 9e616e1db1

Change-Id: I466b333fc629474289198fa21939255b260e47b3