Merge "Whitelist the staging directory in installd"
am: 99ba118644

Change-Id: I5be2f0d4a82e7e352453371a3ca5f8d6e46ab2d3