Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev...
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee8993 am: ec298b15" into nyc-mr1-dev-plus-aosp
am: d5b17b26
* commit 'd5b17b26':
Change-Id: I19daec361c36402cadb7d0ee31c821cdf03127fb