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