Merge "DO NOT MERGE - 2-dimensional Recents activity. am: c13df1eb30" into nyc-mr2-dev-plus-aosp
am: 83d7c2c6bc  -s ours

Change-Id: I3b1773369cee2a79a9083c741057d878d4b496d8