Merge "[SurfaceFlinger] Allow root to capture screen." into qt-dev
am: 273d261d70

Change-Id: Id13849c4413db0e07a8b928f211bc4947ec39938