Merge "libsysutils: Fix vold vulnerability in FrameworkListener" am: 45b4fe454a
am: bac524b0cd

Change-Id: I95154db2cad94aa4c9560b9abeec3c1967891d9f