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

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1084021   I4e4e2568f488b79e2090de27ca05858467927474   Settings: Fix settings force close in monkey test.
1039373   Ie29246173e79249c1d37b8c678ad192ce1d524ef   Settings:Fix settings config of show video call total da

Change-Id: I7adf8084a05a8a60f4788f99308d2e56e2a4a731
CRs-Fixed: 1084021, 1039373