DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am: ef945b6706  -s ours am: db5045a8ba  -s ours
am: aa3e93e397  -s ours

Change-Id: Ie1235a96130bffffd3e180a52c35fcff4a04ef24