Merge changes from topic 'am-eb4443f078884e5f82b9ce2fd7dec764'

* changes:
  Add capability flag for 802.11r fast BSS transition am: fbb63b0923 am: 67e2694fd6
  Add constants for 802.11r am: 3ed7caa0f9 am: 7e6940d728