Merge "SurfaceFlinger: Import hardware flags from aconfig" into main