Merge "Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()" into nyc-dev
am: 49a1c08

* commit '49a1c083addc8cb489a0fad0bd14c795062ecb02':
  Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()

Change-Id: I8dbd7a649b21a86257daf535274cfa52883e8257