Merge "Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034 am: 245b7d70e9" into rvc-d1-dev-plus-aosp am: f91937d84d
Change-Id: I9caa20f0d751001a6fa8f0650784feefad1ce90f
This commit is contained in: