[automerger] Fix type confusion in libpac am: cad79334 am: dfd6a6fa am: 67c9400d am: 8ae53d49 Change-Id: I9afeb65c4d03dfe98863f36e8cc1e5a353c43314