Merge "Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034 am: 6279dcd351" into rvc-d1-dev-plus-aosp am: 53155abf21
Change-Id: I08b5104ae070d326ce5ab80c5d0ec725cef8f8c9
This commit is contained in: