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

Change-Id: I8ee35a24fc7fe2549e7a7a2c0875c0ea24e32476