Merge "Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653 am: 29e0d389bf am: 5e9d33f731" into rvc-qpr-dev-plus-aosp am: 8ea88b4fb4 am: c9f59f783d
Change-Id: I4bdd2186a0f10510305f6f2158c03e3f16a46375
This commit is contained in: