Merge branch 'pie-gsi' of https://android.googlesource.com/platform//hardware/interfaces into HEAD

Change-Id: Iec0d484b5681f6eddfeacb5e5fb3009bc802abd4