Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev am: 5b4a0d6751
am: 82476a3d52

Change-Id: Iec2ea078b5804be48857f8f04c15e126d57634a7