Merge "Refactoring SecureSettingsProto to avoid method limit." into pi-dev
am: 4bd3f99bfe

Change-Id: I0aac058c9eea7a462ad48a7b97faa4cd838c5132