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

Change-Id: Ic801aa98c7511be5e005b71bd1b37e0de687b303