Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList." into qt-dev
am: 3b74a86752

Change-Id: I2b5e70ef834a0d0f4ccc3689d036321094a24170