Merge "Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653
am: ac6c74c146" into rvc-d1-dev-plus-aosp am: eae5f7b28d
am: e9b1e6124f
Change-Id: I1a8f174b2b58cb98d190d6f7573f3ce51890db84
This commit is contained in: