Merge "servicemanager: preload vintf manifest"
am: bd1bb497b7

Change-Id: Id10426c3ba9c2b4c0b99f434f2428bc7e0437d57