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

Change-Id: I7db9f75fe2cda0b401886756b47da1e1ec38f916