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

Change-Id: I894ef166a04e365fa26dfe7e36ea3456355f969c