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

Change-Id: I687031198545e945dcd72950d3c195d312c2d338