Merge "Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: ee3602595a" into oc-mr1-dev-plus-aosp
am: 9446e27025

Change-Id: Ib0068aee9bc2c4c7b605c5ba024c1fa7c0b59cf4