Zom Android 15.5.0-RC-2

8ed187f update to build 1550022
173f87d if nearby not supported, then exit nearby activity
d82adab improve spacing of add contact screen
1a8fc70 add no nearby sharing error message
092f4ff make add friend hint text size larger
d800573 update to build 1550021
27f864e ensure we are updating the group encryption state and also sending postponed messages!
da3f5c1 make sure we disconnect state properly
e456682 improve nearby add friend support
137ea7b tweak add contact screen
7536361 build split APKs
23a63a1 make hint text smaller
f76cd1b tighten up add friend screen
4d0d332 Merge pull request #479 from N-Pex/encryption_setting_tweak
70e66fc Merge pull request #480 from N-Pex/scroll_view_for_467
8436d31 Wrap layout in scroll view to support small screens
c735721 Disable switches until we have a session
c138b57 Merge pull request #478 from N-Pex/wording_fix_463
e02880a update build to 1550014
c71cd26 fix issues for group header for devices < 23
07e8e00 Merge branch 'N-Pex-add_friends_467'
c61a160 add initial nearby contact adding solution
1d7704c add libraries to support nearby implementatoin
0310e62 Updated icons
b2ae7f1 Wording fix for group encryption
743f0d7 New add friends view
e1db0b5 Add share to given package and stub for Nearby
38ee262 Remove extra char
ccaba70 Merge branch 'N-Pex-group_bugfix_474'
15a8fb1 ensure correct service call is used for the new API
0d2188d Role/affiliation fix
b91e1dc Compare usernames, not objects
ec89575 Remove use of temporary final variables in shared listener code
8d0407d Handle null values
6f6f718 Merge pull request #471 from N-Pex/invited_to_group_fix
7f57b3d update handlinge of conversatoins and connections
4d1eb1c update presence constructor
f0b9b85 Lists downloaded before listener set
f1f8e08 Add markAsSeen method and call that if we created the group
c08d0fb only show "sign in" if it takes longer than 5 seconds to complete
875f58a Don't disconnect, as this error is reported even if reconnect successful