Merge "Whitelist the staging directory in installd" am: 99ba118644 am: 3c86bd1dba
am: 67e702ae57

Change-Id: I5fc45c2b1864b52a8b23dea383c0ba9708e0b716