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

Change-Id: I93eb6fca846b8a56b145ddd62fa7a2f86256884a