Merge "Rename the binder cache key for hasSystemFeature()"