Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev am: c1235a1ff2
am: 0caca11df4

Change-Id: Ia47decb98a151786fc9a5262eff20c55814b6170