Merge "servicemanager: preload vintf manifest" am: bd1bb497b7
am: d965b134f1

Change-Id: If00f5f608f1531ce349c8b8b8c70ca949dca7e49