Merge "Remove ResolveUtil from frameworks/base callers" am: 0e1621296f am: 0bd9ac4b69
am: 37e01c985d

Change-Id: Iddadeb5dc0b97180deac407f3196185edd3e0340