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

Change-Id: I7684da1e104dac4f62ed3a7ef3f928c1598509aa