Merge "[installd] fix -Wdangling-gsl in test" am: 463b7bd2e7 am: 063070f0e3 am: 9f3089d57f
am: d767b4761f

Change-Id: I3f5ba412732144dbd3c888108ffc52df9b4552df