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

Change-Id: Ic81a12d9b3c658256c97b04d254fdc080cdd5fb3