Merge "Remove usages of ActionBarActivity. am: 0eff06dd01 am: baed7559c8" into oc-dr1-dev-plus-aospam: 48bb8cdfa4Change-Id: I8eb1c1adab60716a4465fddfdbfd8089e9221c3a