[automerger skipped] [automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: 67c9400dce am: 8ae53d498d am: 358bd5333d am: ac82097329 am: 10c2d8b54a am: 8d9a3d2ea5 am: 402344d63e
am: 4e476c5d7a -s ours
am skip reason: change_id I2e02d994f107e64e4f465b4d8a02d4159a95240e with SHA1 2894c6aa01 is in history

Change-Id: I968d58fe81a99421692894bdf0a66ce97fabd817