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

Change-Id: I3541435ea245841079e34ea5bb7dc704dd3330df