Merge "Deprecate ListActivity and ExpandableListActivity" am: 0600b03d46
am: 87119ab3e2

Change-Id: Id3f4e5cc41c143161b0fc5d7b173a1baff88de5b