Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev
am: eed332bada  -s ours

Change-Id: Ic30714c06a0865911c0e08682ccddd5d4b9ee6dc