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