Merge "Add new key from Settings.java to settings.proto." into pi-dev am: e08a6aa804
am: fd959bc19c

Change-Id: I8d320f220bbdd6427b107783b95ae862283b2a28