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

Change-Id: If95dea203b5563252785802ba19df8288a162589