Promotion of android_ui.lnx.2.1.c1-00020.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1062717   Id7b54abf1766ffaf246bca99efdb483abcb99630   Settings: Fix Diagnostics setting crash issue.
1100056   Ie44022e7138d56b93e4c8f3522cdf0771720409f   Settings : Fix settings option list can not show issues

Change-Id: I74d82fa6c84dbaae3ec6503e620f8d4a2be4e4b9
CRs-Fixed: 1100056, 1062717