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

Change-Id: I27700c001112a0778a3599679f46914000e36174