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

Change-Id: I85ebc8ac6de42d8f93ca7e6e5e4bc9879fae00cd