Merge "Allow to execute postinstall in adb sideload" am: d1b18a797e
am: 2b113e5c32

Change-Id: I39725e2f68d2c9b78b4ac4885a071d761462c982