Merge "Revert "Cache binder calls in CompatChanges"" am: e879968fbf am: 1da820d954

Change-Id: I3bc8bea4eb5dcc7fbda8a3372083e04337e95242