Merge "Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034" into rvc-dev-plus-aosp am: 4ff4d1ac67 am: bea067420d
Change-Id: I8fe9b38dd2f631a925f936a60882f1fa007ba771
This commit is contained in: