Merge "The "ps" command has changed in Android O"
am: 1fc6d09b95

Change-Id: Ia351f281480d578538af732e65dc6b00f3292d97