Merge "Add case sensitive sort to AccessPoint compareTo." into oc-dr1-dev
am: 6a62328517

Change-Id: I01cd4dcc90090d82d93d9b92d446d4a2d97e7aa0