Merge "Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8
am: 558095e583" into rvc-d1-dev-plus-aosp am: 4ee8a227a1
Change-Id: Ib735fb26fc1370a6c03774c4ffd4f3f952e61876
This commit is contained in: