Merge "key_store:Using euid instead of uid when upgrade wifi blobs" am: 63d98e08b8
am: ff0f7e048a

Change-Id: Idd9075e760359a7b370d8743474479ca2c96c74f