Merge "CDD: Behavioral changes in N, for an app with DELETE_PACKAGES permission      trying to delete a package." into nyc-mr1-dev
am: 542c8b8dbb

Change-Id: I2394c20a2a3f7661e7bcddb043157c64a2dee8bb