Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support...
Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev am: c1235a1f
am: 0caca11d
Change-Id: Ia47decb98a151786fc9a5262eff20c55814b6170