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

Change-Id: Id50398b0f4ca595ffa6357e6b4fac9a597e11bfe