NOV-238610: update android automatic context selection #361
angel-ram wants to merge
angel-ram:NOV-238610_update_android_automatic_context_selection into Telefonica:master