Merge "RRS: Apply the default config from persist prop am: 8b2c6f8187 am: a97b993989" into tm-qpr-dev-plus-aosp
This commit is contained in:
8b2c6f8187 am: a97b993989" into tm-qpr-dev-plus-aosp