Revert "Revert "[FSSDK-9432] fix: fix to support arbitrary client nam…#474

jaeopt merged 2 commits intomasteroptimizely/android-sdk:masterfrom

jae/recover-459optimizely/android-sdk:jae/recover-459Copy head branch name to clipboard