aml_rkp_341012000 (10668899,com.google.android.rkpd)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic028cd09c1c747e79cd7535a549c8fdca8309a80