aml_rkp_341015010 (10883484,com.google.android.rkpd)
Snap for 10698237 from 03d6a85fba35eabeb82d0fd5b91a2f7e10aab7d8 to mainline-rkpd-release

Change-Id: I157a14a2f36afa295e0bbc3d9408fbbbe26507a5