Merge "Merge "Remove usages of ActionBarActivity." into oc-dev am: 06600152 am: e889dc0e" into oc-dr1-dev-plus-aosp am: 3bc551c9 Change-Id: I8df92f5ac92b9f5ed4bcbadc09631e9e9de1d626