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

Change-Id: I53c09365ec2d81aa5147c00e9ec3b931dcc15778