Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev