Merge "Remove usages of ActionBarActivity. am: 0eff06dd01 am: baed7559c8" into oc-dr1-dev-plus-aosp