Merge "Emulator: Enable logcat -Q to run in emulator" am: 406d3b6df1 am: 5c8080cc18
am: 4e0937222d

Change-Id: I93add2438689c5c02eb2155e68ba8514d8f8b81f