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

Change-Id: I767afec1a2633ac5fd5daf8b4cceeb8169a22bbe