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

Change-Id: I14a7e384bcfd16617678fe955df3fff7b5c298b5