Merge branch 'pie-gsi' of https://android.googlesource.com/platform//packages/apps/Camera2 into HEAD

Change-Id: I187afe700924cb6363d6e2893f898ba91a7e5f0b